Fix build on GNU/Hurd.

Add 0010-Emacs-should-now-build-correctly-on-GNU-Hurd.patch to
incorporate the relevant upstream patch.

Thanks to Pino Toscano <pino@debian.org> for the report.

Closes: 725099

diff --cc debian/.git-dpm
index 20ad106c17c5277a4175c18def003d8b175ce8ca,0000000000000000000000000000000000000000..8469e2b1f0d0f424ffdcf569eb1f1095eb2638d7
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- 5f08d4eba0c5bb51294ee89d4285f3cc6dde925f
- 5f08d4eba0c5bb51294ee89d4285f3cc6dde925f
 +# see git-dpm(1) from git-dpm package
++528d95ed8059eff519fc4f1826109dafdff2e9b0
++528d95ed8059eff519fc4f1826109dafdff2e9b0
 +24c1fe67725d87a843919696fdc1ff49c99e7fd4
 +24c1fe67725d87a843919696fdc1ff49c99e7fd4
 +emacs24_24.3+1.orig.tar.bz2
 +421a2aef37aedf8ca24bb57cd100d173022e79a4
 +25725234

diff --cc debian/patches/0010-Emacs-should-now-build-correctly-on-GNU-Hurd.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..8fb73c0f60705f6ec879eb8b38ffa656290b4cb8
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0010-Emacs-should-now-build-correctly-on-GNU-Hurd.patch
@@@ -1,0 -1,0 +1,69 @@@
++From 528d95ed8059eff519fc4f1826109dafdff2e9b0 Mon Sep 17 00:00:00 2001
++From: Paul Eggert <eggert@cs.ucla.edu>
++Date: Tue, 12 Mar 2013 22:04:46 -0700
++Subject: Emacs should now build correctly on GNU/Hurd.
++
++Applied upstream patch:
++
++  * sysdep.c: Remove a use of BSD_SYSTEM, which I'm trying to phase out.
++
++  Include <sys/param.h> unconditionally, as that works elsewhere and
++  is simpler here.  Include <sys/sysctl.h> if DARWIN_OS ||
++  __FreeBSD__, not if BSD_SYSTEM, since it's needed only for Darwin
++  and FreeBSD now.
++
++Origin: upstream, commit: 112030, f83f57c2e20531ff3442904bc450607db19e999c
++Added-by: Rob Browning <rlb@defaultvalue.org>
++Provided-By: Paul Eggert  <eggert@cs.ucla.edu>
++Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=725099
++---
++ src/ChangeLog | 8 ++++++++
++ src/sysdep.c  | 7 +++----
++ 2 files changed, 11 insertions(+), 4 deletions(-)
++
++diff --git a/src/ChangeLog b/src/ChangeLog
++index 921d411..01acb02 100644
++--- a/src/ChangeLog
+++++ b/src/ChangeLog
++@@ -4,6 +4,14 @@
++      We can't portably rely on PTY_OPEN doing that, even if
++      it calls posix_openpt with O_CLOEXEC.
++ 
+++2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+++
+++     * sysdep.c: Remove a use of BSD_SYSTEM, which I'm trying to phase out.
+++     Include <sys/param.h> unconditionally, as that works elsewhere and
+++     is simpler here.  Include <sys/sysctl.h> if DARWIN_OS ||
+++     __FreeBSD__, not if BSD_SYSTEM, since it's needed only for Darwin
+++     and FreeBSD now.
+++
++ 2013-03-11  Glenn Morris  <rgm@gnu.org>
++ 
++      * Version 24.3 released.
++diff --git a/src/sysdep.c b/src/sysdep.c
++index 19c5686..f62b6f0 100644
++--- a/src/sysdep.c
+++++ b/src/sysdep.c
++@@ -40,9 +40,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
++ #include "sysselect.h"
++ #include "blockinput.h"
++ 
++-#ifdef BSD_SYSTEM
++-#include <sys/param.h>
++-#include <sys/sysctl.h>
+++#if defined DARWIN_OS || defined __FreeBSD__
+++# include <sys/sysctl.h>
++ #endif
++ 
++ #ifdef __FreeBSD__
++@@ -71,9 +70,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
++ 
++ #ifdef MSDOS /* Demacs 1.1.2 91/10/20 Manabu Higashida, MW Aug 1993 */
++ #include "msdos.h"
++-#include <sys/param.h>
++ #endif
++ 
+++#include <sys/param.h>
++ #include <sys/file.h>
++ #include <fcntl.h>
++ 

diff --cc debian/patches/series
index db10c35dd42f49082baa1f39c36a1e4968bc87fa,0000000000000000000000000000000000000000..26a9f4c631d9257dda99732870eefe40358d8317
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,9 -1,0 +1,10 @@@
 +0001-Prefer-usr-share-info-emacs-24-over-usr-share-info.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
 +0007-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch
 +0008-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch
 +0009-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch
++0010-Emacs-should-now-build-correctly-on-GNU-Hurd.patch